<html>
<head><meta charset="utf-8"><title>Change repo defualt merge policy · t-lang/wg-unsafe-code-guidelines · Zulip Chat Archive</title></head>
<h2>Stream: <a href="https://rust-lang.github.io/zulip_archive/stream/136281-t-lang/wg-unsafe-code-guidelines/index.html">t-lang/wg-unsafe-code-guidelines</a></h2>
<h3>Topic: <a href="https://rust-lang.github.io/zulip_archive/stream/136281-t-lang/wg-unsafe-code-guidelines/topic/Change.20repo.20defualt.20merge.20policy.html">Change repo defualt merge policy</a></h3>

<hr>

<base href="https://rust-lang.zulipchat.com">

<head><link href="https://rust-lang.github.io/zulip_archive/style.css" rel="stylesheet"></head>

<a name="159142949"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/136281-t-lang/wg-unsafe-code-guidelines/topic/Change%20repo%20defualt%20merge%20policy/near/159142949" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> RalfJ <a href="https://rust-lang.github.io/zulip_archive/stream/136281-t-lang/wg-unsafe-code-guidelines/topic/Change.20repo.20defualt.20merge.20policy.html#159142949">(Feb 22 2019 at 09:41)</a>:</h4>
<p>It seems the default merge policy of the UCG repo is to "rebase and merge". I find that quite annoying, because it means that the commit I am submitting in the PR never actually ends up in the repository. This makes it very hard to track which <a href="https://github.com/RalfJung/unsafe-code-guidelines/branches" target="_blank" title="https://github.com/RalfJung/unsafe-code-guidelines/branches">branches of my fork</a>, as well as which local branches, I can delete.</p>



<a name="159142957"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/136281-t-lang/wg-unsafe-code-guidelines/topic/Change%20repo%20defualt%20merge%20policy/near/159142957" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> RalfJ <a href="https://rust-lang.github.io/zulip_archive/stream/136281-t-lang/wg-unsafe-code-guidelines/topic/Change.20repo.20defualt.20merge.20policy.html#159142957">(Feb 22 2019 at 09:41)</a>:</h4>
<p>I propose we follow a more git-style workflow and actually preserve the commits that get submitted in PRs.</p>



<hr><p>Last updated: Aug 07 2021 at 22:04 UTC</p>
</html>